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