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