Merge cherrypicks of [15981479, 15981480, 15981481] into sparse-7698606-L95500000952403884.

Change-Id: Ib18b360932fdc963b31a2896d5445323d5f07871