Snap for 6085360 from c88aae2d9edbf1dbb896bd3595ea25889f29a016 to qt-qpr2-release

Change-Id: I1e8dba3d01adb9786c048a90a81dd5844c3c3ac4