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

Change-Id: Iec1f2931a5780b9fda13aae709ef3bdbd65dcfc1