Snap for 4816034 from f6b3ad1b7e6beb7fc6faa4a5661cba8bada2d46d to qt-release

Change-Id: I79d5b66a7c2a5ec92ba83d495f1c4cee6656c2a9