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

Change-Id: I7111afa34f95ef15723e884371f7956c45220ff6