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

Change-Id: Ie9dcbb2889860e4c3ec55965e616d25e2be5a51e