Android CTS 8.1 Release 8 (4902914)
Merge "Merge cherrypicks of [719644] into oreo-mr1-cts-release" into oreo-mr1-cts-release