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