Snap for 6072377 from fc62052d3446475a045ee533e0b6dcec1eff8109 to qt-qpr2-release

Change-Id: I0d3d17e575a2ae00083ca3a3cb95c978b4d9ad03