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

Change-Id: I212fadd256b0a4ee64178910429515f597600476