Snap for 6121067 from 7e2c516f5b78c1f5e2302fc0fa77709d67da6c6b to qt-d4-release

Change-Id: Ib50ab7ba44670acbae77c92465a0213ac21e1564