Snap for 5333170 from e9afa28841933dbd4fc36e526fe6bb70611b657a to qt-release

Change-Id: I98e87783cf915b021f1d4531234f251e032d4829