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

Change-Id: I7523b82afc2c11db7bb275fa1ddd9fc5aafc34f8