Merge cherrypicks of [20069028] into sc-v2-platform-release.

Change-Id: I97f9a371eeb12dadabc4e02473c75b5eaabb1c69