Snap for 5605988 from 3df5ecdf906cbaaa689190e1026b02a13b9b7f12 to qt-release

Change-Id: I9294b360c3f50d6899cab14af741328081ad6bf7