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

Change-Id: I97c7d598e7a80afe329038075e659c5882f9d5c5