Merge cherrypicks of [18231932, 18439684, 18699572] into sparse-8599181-L64200000954895490.

Change-Id: Idc08019a87950410cb7e9907ad0b2e686959f9e6