Snap for 6091187 from 96d6745fe4dd110d2f23e3811e36c798a75dd2a7 to qt-qpr2-release

Change-Id: I3a07180a2f4f79d388c3d471a3bb08405c6fea48