Merge cherrypicks of [9289279] into qt-release

Change-Id: I7dc3ba4f3d16d8c4067c708734cfc610e63c129b