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

Change-Id: I5ad10652e4ba23d30bacccd917354f4095f7aa7c