Snap for 5652667 from e3cc180d3121c98a5b5c14e0dbaa080169b46ae6 to qt-qpr1-release

Change-Id: I87b9aef60fb242db67a05d8070ae7898706b0233