Merge "Create feature flags for OMAPI readers" am: e7bd66528d
am: c94e8d38fa

Change-Id: I7a278f9b4ca8b39401c8ebcc250cb423bb47689d