Merge cherrypicks of [6531415, 6531491] into qt-release

Change-Id: Ibb36d13d1d8f6ead71c1ed6983c08bc8e8ff609b