Merge "Snap for 4455664 from 58071a32e4c337735e837a28b67fd49a22c81c8e to oreo-vts-release" into oreo-vts-release