Snap for 5582435 from a52393116146072ff3c20fd8b9ca56fe7327f994 to qt-qpr1-release

Change-Id: I9648ab765b0cc2fa1b72c90f145b005d94422408