Snap for 6128439 from 7851fab9734cc957f85c893a5b82842933409628 to qt-qpr2-release

Change-Id: I1514a708fad008d7e9064cf4b5e2c11f04e6c7c0