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