Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245,...

Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245, 3898959, 3898960, 3897790, 3898312, 3898313, 3898314, 3899155, 3899156, 3899157, 3898289, 3898290, 3899061, 3898291, 3898292, 3896951, 3899158, 3898961, 3898938, 38982460] into sparse-4657601-L30800000163316240

Change-Id: Ic46c21eef4b216774452afbac399e3d04947f053