Merge "Snap for 5064646 from 7e07d162900aa1c81feb6d54f3778cbcea98e2a0 to oreo-mr1-vts-release" into oreo-mr1-vts-release