Merge cherrypicks of [6227544, 6227441] into qt-release

Change-Id: Ie35c573e3764e9547aa13e435e723d40c60cb0fd