Merge cherrypicks of [16373492] into sparse-7698606-L95500000952403884.

Change-Id: I7eea00125db58176a74c21194b7d5c0a220e467f