Merge "Snap for 4615389 from ad51be6e442b42d9cc4c501777a29bf38ad21e9c to oreo-cts-release" into oreo-cts-release