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

Change-Id: Ib8d569eae4260b3c2a43bf36efc8b448cbf49b9d