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