Merge cherrypicks of [2183430] into sparse-8938966-L91200000955914215.

Change-Id: I78ad742f81e032b0e1c10e0d0f798ac0339050e2