Merge "Snap for 4711598 from 1f23b0bad13a047167910419b34dbad8b17a2eac to oreo-mr1-vts-release" into oreo-mr1-vts-release