Merge cherrypicks of [9514600, 9517315, 9517610, 9517666] into sparse-5908172-L30000000374561275

Change-Id: Ib452860b94258dd57b631af4c3b2846eaff8ef91