Merge "Snap for 4379964 from 9ece1d6a1edbe4f321932cb8d7f94f42a3153db2 to oreo-cts-release" into oreo-cts-release