Merge "Snap for 5063281 from be38bb01ebbe9e0dc70865dfe2bdaf9551978df0 to oreo-mr1-cts-release" into oreo-mr1-cts-release