Merge "Snap for 5918746 from b90a406ee3e66591e55a94916e32c6b79d582279 to oreo-cts-release" into oreo-cts-release