Merge cherrypicks of [10916097, 10914739, 10912787, 10909613, 10915495, 10914740, 10916100, 10916045, 10916046] into sparse-6342279-L99500000514397997

Change-Id: I465ff39e0f9dbf5e65da10ab2f05be4e0ee19093