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