Merge cherrypicks of [2219863] into sparse-9078332-L63700000956455272.

Change-Id: I7ec13f2dd73e4419a425f5ef020eddb84baf8db5