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