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

Change-Id: I4bcd9e3bfbe85705c275543adfcedad524b4aa7b