Merge "Snap for 5898100 from 878e2738ac37977c576bb3207e1f820a625b80ee to oreo-mr1-vts-release" into oreo-mr1-vts-release