Merge cherrypicks of [11358637, 11357965, 11355583] into sparse-6436923-L65000000546543974

Change-Id: Ib777d40f7d2fecea1347695673a9030d86b2deef