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

Change-Id: I3ab3757d08e151b315f217b3e4eb99cee656e3bd