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

Change-Id: I5740225d58489ae0ee56fca18e6b3af5c0635935