Merge cherrypicks of [16790769, 16820286] into sc-v2-release.

Change-Id: I91f527f5364cefdffa92f54718959602e0fa4d36