Snap for 6122036 from 0ecf07e8340246bcacc6e5c4c3fdc86b8af08831 to qt-d4-release

Change-Id: I8c7d5e4470c5c76160ab8694978bcc027a5638c1