Merge cherrypicks of [11475931, 11482437, 11481411, 11479138, 11482233, 11482049, 11482090, 11481427, 11478959] into sparse-6416773-L10500000558791133 Change-Id: I3a5f4c683d6818e3d5c2c37ac92eb73a1db8838d