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

Change-Id: I5b948563055e9c92397c1650f1e92dbbd91115d1