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

Change-Id: I9343dd50d9a853133f04f824442a9b82417b74be