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

Change-Id: Ibf6c70f7ff2e1c63cc46d7fa03305c9e998f6f57