Snap for 5582435 from 9681eef5ff179980ae0d1c5437894f34ea7cfe87 to qt-qpr1-release

Change-Id: I38ee4ee56c98b79bf2eb64e92ce6df239f825d7c