Snap for 5534160 from 9681eef5ff179980ae0d1c5437894f34ea7cfe87 to qt-release

Change-Id: I5bef0ed5db0af546d411d7f1a16f7ade69a21eab