Merge cherrypicks of [19981131, 20100213] into security-aosp-sc-release.

Change-Id: I16d55b150051596d878eaefbbae80b8b7e19f811