Merge "Snap for 4379964 from 2efbc7239f419c931784acf98960ed6abc38c3f2 to oreo-cts-release" into oreo-cts-release