Merge cherrypicks of [17804723] into sparse-8442990-L64700000954185246.

Change-Id: Ibc2662cc74294e841c80cd4faa70886db31df172