Merge cherrypicks of [17605115, 17625394] into security-aosp-qt-release.

Change-Id: I7078fec450ee0f42795ac744df5ef7b6c7b2d367