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

Change-Id: I22033ded42a0df9056ae2cd8e437cf16e44d311b