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

Change-Id: I605784d3f6af1a3ae830ae7fff797bbc288e5ad1