Merge "Snap for 4624361 from 36609b906e645adea3291fdd0b649e35852e206b to oreo-mr1-cts-release" into oreo-mr1-cts-release