Merge cherrypicks of [17585758] into security-aosp-qt-release. Change-Id: I60ffa81746e98da9b906686adf6c6761d214a774