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