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