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

Change-Id: I2abc51be384ceb0e67b1138612ca8e92cffc819d