Merge cherrypicks of [17245462, 17129429, 17310817] into security-aosp-qt-release.

Change-Id: I7cac9f4f70d0543e91807f124b3d05e0940d9c34