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