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