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

Change-Id: If4f02403f205a607b6231553222000934c85ed9e