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

Change-Id: I387b0c35fdcace7b8f0e316de650cba441a3dd90