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