Snap for 6145145 from c4d9f202e10c9812e09a2b604c2f8c13393cdd19 to qt-qpr3-release

Change-Id: Ib2ebed1abb6f83dedbfe2f629471e8efb45d07f1