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

Change-Id: I04e3af7a595971d319673d11e33fc35d82a85946