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