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

Change-Id: I03d4d017d215b4b360064faf04f689cf6f4c2426