Snap for 6117658 from aa0557714885b9e99cec54fd30a16cef5f696d85 to qt-qpr2-release

Change-Id: If41eefd19ded38321c7af43ca214bcdd816c0146