Snap for 5333170 from ff44b8d05f7df16fb29c47ddf734c3a2f35a7f97 to qt-release

Change-Id: I1c53070d70b0b2f6e06a8b4d59755f9c7b708402