Merge "DO NOT MERGE: Make the tests permissive for O" into oreo-cts-dev am: 05c6fc38a1  -s ours
am: 9e52ce0be7

Change-Id: I44afdb4faccd9d42753b1b720d8625fcfa9ba110