Snap for 6016742 from 0c81b1770a0eef52556d7579ae7694df864c8bc0 to qt-d4-release

Change-Id: Ide98586557bbdbe8fa7f7561d85025a2f1674bc7