Merge cherrypicks of [2162536] into sparse-8855514-L88000000955590010.

Change-Id: Ic4df2785dfb805f8f35d5e4af2b21358294f5787