Merge "Snap for 6421779 from f4c22a5117837a1bbef5b0a4339623e33133182e to oreo-mr1-vts-release" into oreo-mr1-vts-release