Snap for 4832164 from edefaef9ef53d9eaf741655ceb70744f434bf57a to qt-release

Change-Id: If7bf5d984a81d019a6f69f18f3365dd8809858e0