Snap for 6145363 from c4d9f202e10c9812e09a2b604c2f8c13393cdd19 to qt-d4-release

Change-Id: I8f035beaa6fd720f858593b88bedb1d5e57118fe