Merge "Snap for 4891529 from e7483acd9b0928a2506e786ec1df3fce2db87aad to oreo-mr1-vts-release" into oreo-mr1-vts-release