Merge cherrypicks of [19698597] into sparse-8953738-L24100000956066300.

Change-Id: Ia88de4faba30590075f6cfbde39b3e388aa1b1a6