Merge "Snap for 4455664 from 3d913d4ac8ded0f75c48dac2ffac60fd51c6a2b4 to oreo-vts-release" into oreo-vts-release