Snap for 5876498 from 681ac71f798f93c4633737b787ebd930bd4453de to qt-qpr1-release

Change-Id: Ibdfd0969833a63653b220c1b1c517305ff97e0e5