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