Merge cherrypicks of [2116141] into sparse-8690516-L81700000954980821.

Change-Id: Ib67bc9308e130a6e8d3e060c6f7b8e347c03d0b8