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

Change-Id: I6fe7abf9e9045da517ed777118a94dc046cfab82