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