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

Change-Id: I4311bb86074146a0a61b7ffb14156d6621425b87