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

Change-Id: I5c33f33596858d26d370159c398dfc31daacde13