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

Change-Id: Iaba48f9ca5eef35fa0700e38aefddd70766257d9