Merge "Snap for 4615400 from 9aac27a8bde0bcb2cf5c10fdc54ecf15136782ac to oreo-mr1-cts-release" into oreo-mr1-cts-release