Snap for 5716396 from b57c006c9fc4285a0a217ce443049fd4d610f6f4 to qt-release

Change-Id: Ia3b2db3ed785c9a49c20dd115931cdf5c97ea964