Merge cherrypicks of [2157804] into sparse-8845608-L85500000955524881.

Change-Id: I33c6cea01f67b558f90c94143eccaefeb7772a84