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