Merge cherrypicks of ['ag/20758529'] into security-aosp-tm-release.

Change-Id: Ibe06b6f836132c316c1d91b6390a29f16b08ddcb