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

Change-Id: Ib861d207385756c6d225128982c17847d1e4cd24