Snap for 4821358 from 150fa8d1476d0ad8bc93f3bac6892f862b17f046 to qt-release

Change-Id: If745a532a8f49ba4c17434eaa190178904b13a37