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

Change-Id: I5048c7ac80e24d7ee3181aff053341dbe23c4682