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

Change-Id: If68a7a6cd997e7257a8e543023140294709bffe8