Merge "Snap for 4660255 from f050493ebf19c98dcb04386c3610bac8038f27fd to oreo-vts-release" into oreo-vts-release