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

Change-Id: Idde92800412e91070854ccf0771b7130b5d54c6a