Merge "Snap for 6164583 from 7190845abd95cc33678751dcfbb729a155363ac9 to oreo-mr1-vts-release" into oreo-mr1-vts-release