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

Change-Id: I4c7d068907b3896a9a607145d131068acbbf3e17