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