Snap for 5339364 from 3d6f8aab6378e6c6909769c241467141dda5ab86 to qt-release

Change-Id: I994cf2f5a50d1c121e0cba654e8e10a92602a926