Snap for 5558509 from cd000f8449a29ea9f881eee7ac57d9284c463b57 to qt-release

Change-Id: I798ab1313823ef514ea42985b0f311245137ed52