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

Change-Id: I812e9bfd2dc02318d8e233b8ebcb915dc2258cd2