Merge "Snap for 4526935 from 7bb7dfb72a0011f63063879df90ef67dece5c0c9 to oreo-mr1-cts-release" into oreo-mr1-cts-release