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