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

Change-Id: I69284cadd977bc78b5ffa77bdf6571c62c4dd46a