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

Change-Id: I5d7eb5c41f8ad5b9d424a7534e2e91f6430b49ff