Merge "Snap for 4711598 from 833770d26f7813768e195d22ca9c8e41dc83448a to oreo-mr1-vts-release" into oreo-mr1-vts-release