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