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