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

Change-Id: I990baed98ccba6719adc35a9f259d54f3f20eb5c