Merge "Snap for 5009057 from 9e36cba49e8418c6354a193b0cf97507fa5c20be to oreo-mr1-cts-release" into oreo-mr1-cts-release