Merge cherrypicks of [16844503] into sc-v2-release.

Change-Id: I2a0de00b83b611dd09508d673cbeb75720f02d96