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

Change-Id: Ia40f26abc5c2914274646d22abbb959afabebc52