Merge "[Do not merge] Relax the test description due to a bug in Oreo" into oreo-cts-dev