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