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

Change-Id: I0a8a43cd149246cdaeca142e879593ed9b1ee05c