Merge cherrypicks of [16413583] into sparse-7976617-L34300000952210344.

Change-Id: I26775d23abed0273ea16402911b88b42a8d78169