Snap for 6117658 from 45dbf8cc5a50e2ef843f60185b16c171aeccb823 to qt-qpr2-release

Change-Id: Ic11d6d6c6c20845136cba717270dfc944ff8e91a