Merge cherrypicks of [16441898, 16441899] into sc-v2-release.

Change-Id: I9fbbca76745f9d0cb20b142d1e1c00cf1f6d25c1