Merge "Snap for 4649591 from 72f790b906d5e45215df0c00fd897ac084841b00 to oreo-mr1-cts-release" into oreo-mr1-cts-release