Snap for 5480912 from 54ae24843ca798bdc62ac951a64b034775ab8208 to qt-release

Change-Id: I6f6d27b9ea8bd4765783b57170ebd449879da28b