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

Change-Id: I82a98a8f55b4cdd3ad4c60027b66613ef13e5c47