Merge "Snap for 4726689 from f1d87d06cf9c2d9a47739486fb84306643a828cc to oreo-mr1-cts-release" into oreo-mr1-cts-release