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

Change-Id: Id45d0ab253179693e7aaf7b1075e2dfb84d9e493