Merge "Snap for 4630954 from bb9573c146b8e634ea6143653c5556816c1bce21 to oreo-mr1-vts-release" into oreo-mr1-vts-release