Merge "Snap for 6139874 from f2c77e4fb293dd1627343f76feb966337e0a5626 to oreo-mr1-cts-release" into oreo-mr1-cts-release