Snap for 6091187 from edee43aaf41894b7ce520011cffbc60f2ecb53e6 to qt-qpr2-release

Change-Id: Ibc7f26f934e10d32f58f2a697a3f97774521b968