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

Change-Id: Ibf6092b3504ee4e773ce7b1954bba2f877ba39ac