Merge "Snap for 4455664 from 14755fe043a85206ab5e78f62f28a04e0de5ef11 to oreo-vts-release" into oreo-vts-release