Merge "Make OMAPI stricter"
am: 998ef794a3

Change-Id: I34232eea503b3d95b22d4a8fa9e366c857264e78