Merge cherrypicks of [18797389] into sc-d2-release.

Change-Id: I8e0e0959b7aa37deb3fadebbbcd7727788b0fea3