Merge cherrypicks of [16736788, 16736789] into sc-v2-release.

Change-Id: I005677f1edf91dcbc3d85c4f7998bf7b4ac6f6c5