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

Change-Id: Ie6ca209c1badd5420eeac2c82887ddf7dce0940b