Merge cherrypicks of ['ag/20758528'] into security-aosp-sc-release.

Change-Id: Icd1b47e8b917dff2dee78e303399928c3d79c09c