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

Change-Id: I5dc8e162c4a586635b6f6d4e0302450caf6e21be