Merge cherrypicks of [5624891] into qt-release

Change-Id: Ibde2a19da63c5612dbd379d23d3f57e47a5eaf54