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

Change-Id: Ia4b215cd0aab1d34d82d980bc2cb854c79c4a297