Merge "Snap for 5029157 from ee867d0c901502f491a9d3fcca64d01f0ef98e97 to oreo-mr1-vts-release" into oreo-mr1-vts-release