Merge "Snap for 4640417 from 72f790b906d5e45215df0c00fd897ac084841b00 to oreo-mr1-vts-release" into oreo-mr1-vts-release