Merge "Snap for 6139838 from 7832d1c8bfbcb3fa439aac2e492d7ec2dc2c1673 to oreo-cts-release" into oreo-cts-release