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