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