Snap for 5546586 from 39c064de0b98a5184a8537c11ad8320e5d7dcec1 to qt-release

Change-Id: Ida000eea71b7f7a1dbd1e63ccee6522c7399c592