Snap for 5716396 from d96d3aaed40a05b5394e2d738a7a7830b31278b3 to qt-release

Change-Id: I22b8d8e9eb2ffec9bdc00a3b1733a717ba3f2bc3