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