Merge cherrypicks of ['ag/20614049', 'ag/20069005'] into security-aosp-qt-release.

Change-Id: Iadcd5a2415beae2f85eb247086a1afa06004275d