Merge cherrypicks of [15718931, 15718932, 16248754] into security-aosp-qt-release.

Change-Id: Ib47517043d7801513c9662bad04aff415a7b76ed