Merge cherrypicks of [16736103, 16736104] into sc-v2-release.

Change-Id: I092ca9f4a4c0c8c7968db29034a8476c2f82a62e