Merge cherrypicks of [2063829, 2067267] into sparse-8431950-L00000000954266112.

Change-Id: I07cedf853268c83e157d0fb6c31e95f7b7d6b32b