Snap for 5534160 from edb348c7c282166bbef37fba5b0a8ef4b6322a8b to qt-release

Change-Id: I791b2ee8c2f52e0a4bf93329d1bf319f94440e31