Merge cherrypicks of [2136215] into sparse-8771784-L11600000955264245.

Change-Id: I4f7b9e3a96ba785ed8e7d663f43af3f71a88e92b