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