Merge "Snap for 4711598 from af698d7b957dccc8971f7b9524117288f554a03e to oreo-mr1-vts-release" into oreo-mr1-vts-release