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

Change-Id: I21b15940f7b0f96fedbea57438605d8d98fbbce5