Merge "Snap for 5898100 from 35a32100d904b91e714cdd40acdc10f469ff6896 to oreo-mr1-vts-release" into oreo-mr1-vts-release