Merge "Snap for 5327547 from a8619c3dd3773c592894e5ab22d49c30477c7c03 to oreo-mr1-cts-release" into oreo-mr1-cts-release