Android CTS 8.1 Release 16 (5732005)
Merge "Snap for 4526935 from bb1cab7a642ce15c0c69b6c987177204bc81fbcb to oreo-mr1-cts-release" into oreo-mr1-cts-release