Merge "Snap for 4907460 from 287330bf4de3bb9a9117e3b86102ef2ef9342fa4 to oreo-mr1-vts-release" into oreo-mr1-vts-release