Snap for 5567188 from 146f745d0de292a04b88d1665edbdb4c75f9dbeb to qt-release

Change-Id: I016b434a1b1d1cb11dec031095b309cf59942902