Snap for 6069307 from 221cd9e93b94def60aa4a5adbdd3bfa91502bdc8 to qt-qpr2-release

Change-Id: If9f970bdf48213b137be9309182e35d7e3cb0804