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