Snap for 5090430 from f9eda22780a30c091f1ff062f9d8a5d851dcdb65 to qt-release

Change-Id: I6bedc537610b8b8b245a8469e0a4b7ab9bc8e2d8