Snap for 5546586 from 08e4f3aa67cdce37abae88b9e50a60b0006c825f to qt-release

Change-Id: If3f1316d08aaf639623bebeb3dacff8b276705eb