Merge "Snap for 4788939 from 9d31f82f583040fe04f04ae96c4d48da94d8dd19 to oreo-mr1-vts-release" into oreo-mr1-vts-release