Merge "Snap for 4711598 from 56fadcb037d2a17736f0bc118f7226fc6f002d85 to oreo-mr1-vts-release" into oreo-mr1-vts-release