Merge "Snap for 4640417 from 68505b3110160bb83b68ef0f61663446593d9c06 to oreo-mr1-vts-release" into oreo-mr1-vts-release