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

Change-Id: Ia5c9bdda7eab31bc96c72c37101003c96fc029df