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

Change-Id: I9ef5f1e3429d82179a5274aba85c4a0fca16ea9e