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

Change-Id: I637b089db1894fd8da178028ba4ad582cc94e513