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

Change-Id: Ieba6045e013dcace9078cfe7aacf841b3ae3da38