Snap for 5704971 from 7abed5d4cf741aca02836d06664263dc1e3aa699 to qt-release

Change-Id: I85a3361a3eba5ef344e439d79a33674dbe3a6499