Merge "Snap for 5965265 from fc914074509ead6ba30bc2dd5655ca876cd99167 to oreo-mr1-vts-release" into oreo-mr1-vts-release