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

Change-Id: I06d1d012a71a678964eb5c005f1dc66cb623db56