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

Change-Id: I8399bf6b1d76ed0d0d521264b4a8970e058d097e