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

Change-Id: I027076c9be65083bc49c2d28b538c3eadb9e4ec2