Merge "Snap for 5238180 from e3b6fdc7f11c220537bb69d032cd95bce68f1ad2 to oreo-mr1-cts-release" into oreo-mr1-cts-release