Merge cherrypicks of [16691349] into sc-v2-release.

Change-Id: Ic38459ae48b114728380cc232acb7d9082d9be8b