Merge "Snap for 7962552 from 61e0123122987e88193f53ad1206f06dcd3194eb to oreo-mr1-cts-release" into oreo-mr1-cts-release