Merge cherrypicks of [16840243] into sc-v2-release.

Change-Id: I4eacdb4681a90b0cd7d17a24bb11d8efce59d76e