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

Change-Id: Iccda1fe973bad3cf30210c5a99757d30b7c13516