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

Change-Id: I48db8eee0b596c379af3de8a2d271da4499beca1