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

Change-Id: I3e116c0dbe1b95d689f6a813926a24e3bdaa330a