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

Change-Id: I0efc541235ccf4fa7c17c5df63b306533e95e0c3