Snap for 5656431 from 702981f54fd3a891f42f3282497b7e73b74b350a to qt-qpr1-release

Change-Id: I81a430910471eedd7b7f375d5d7c9dd88069d810