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