Snap for 6091187 from 8f72d008d0c51da507fc3c447e68e02b9e2d8535 to qt-qpr2-release

Change-Id: I33e175ef2035398744d91a23ddea7a41f9ad607c