Snap for 6120874 from aa0557714885b9e99cec54fd30a16cef5f696d85 to qt-qpr3-release

Change-Id: I097550b0892a56762db7832aa3571923879f2fa3