Merge cherrypicks of [17800024] into sparse-8423425-L65900000954202187.

Change-Id: I6fd51851eeca511033153265ed7b8e217ebbae8c