Merge "Snap for 4402652 from 8d1bba5bee354658d9c68744795bb7983986e444 to oreo-cts-release" into oreo-cts-release