Merge cherrypicks of [19292738] into sparse-9282069-L02500000957416337.

Change-Id: I77df5324df29d8c264040c45b57b26be275b11b0