Merge cherrypicks of [19545249] into security-aosp-qt-release.

Change-Id: I63503cd63f7da5bf08a141dabb72e182a5957164