Merge "Snap for 4455664 from f135b4a26e7019418dda93451cb9245dd73e2604 to oreo-vts-release" into oreo-vts-release