Merge cherrypicks of ['ag/20616433'] into security-aosp-qt-release. Change-Id: I2c666cee75bc832e578e9ef3d901a408e12ead0c