Snap for 6105141 from f0fe2de594d0040ae3f5ddda9f3c16c5b465ef92 to qt-qpr2-release

Change-Id: I695deeb4289238a8a25cb29d0a264bcdb91e45e3