Merge "Snap for 7803222 from a307c7cdf05dc1eb0f219fa03cf0f2bcc8c06451 to oreo-mr1-vts-release" into oreo-mr1-vts-release