Merge cherrypicks of [17950696] into sparse-8561228-L61200000954771861.

Change-Id: Iffb2c16d8e904f55b127497c97aa399ac63d3d15