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

Change-Id: I567c6dd5403089611f635c2cae0ad3bdbb791517