Merge cherrypicks of [16738003, 16738004] into sc-v2-release.

Change-Id: Iba216055b554c0476eee51ad6f867d0863953ccf