Snap for 5333170 from f8a59f3fe1a675d75678b3e3579a9a8cb46b4fa7 to qt-release

Change-Id: Icf4388c0782f9e9b6188c95f49d336dc524cc8f7