Merge "Snap for 4379964 from 30fdd01f2e69f8235dafe4cb2fef2577d48458f3 to oreo-cts-release" into oreo-cts-release