Merge "Snap for 4640417 from 6021cde9513345ff2bc20b518a3d8aadc2e4d15b to oreo-mr1-vts-release" into oreo-mr1-vts-release