Snap for 6047641 from a27a718991d5f96b5342b36c8ed4180169917ce8 to qt-d4-release

Change-Id: If38e6500cf6a3cecdec933331e433bca57524b6b