Merge "Snap for 4711598 from 87d12ea5e997a12c9edd5139082aec0feacacb27 to oreo-mr1-vts-release" into oreo-mr1-vts-release