Merge "Create feature flags for OMAPI readers supportiveness" am: 65e73f09fd
am: 3e2865f585

Change-Id: I1c86601d6ee02619ee0d0cdad7cefd51e2a95989