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