Snap for 5228332 from cc0d0f04ece25f606e614a326b56db4b39e8cb82 to qt-release

Change-Id: If94b79a549d529526cfeda5a6761ea929b23eb38