Snap for 5434517 from 72e5e3c53365d0ca10aaba7801876f6d9cb0678c to qt-release

Change-Id: I093b8cc7c9e7c281ccfc8135c5d38d44ea05f5f0