Snap for 5212161 from 610a17c2139830070c0dc56540d35aeb64222ec7 to qt-release

Change-Id: I5edb056d3edbe7a0356f41ab3f68a8b998c1ea38