Snap for 6304846 from 693f6b373e80ca0eeb8eaebc5a50f8ad9b3cb215 to qt-qpr3-release

Change-Id: I2dbb62acfd776926799f7f20b37f44372a9b4f6e