Merge "Snap for 4444158 from 53a9ccaa926945149b4546c67b50ce1ae88ba777 to oreo-cts-release" into oreo-cts-release