Merge cherrypicks of [18818722] into security-aosp-sc-release.

Change-Id: If50127db937fa074a6f3137fd3b9a142009c930b