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

Change-Id: Idee1d0d7c98b316a6db8fa6f7d4b5de01765558c