Merge cherrypicks of ['ag/20615113'] into security-aosp-qt-release. Change-Id: I1aa6605be236783392227f244265b82bc7786a40