Merge "DO NOT MERGE: Make the tests permissive for OMR1" into oreo-mr1-cts-dev