Snap for 5231632 from 0b490498a1b413ea03bbd13496804a2ad6549da2 to qt-release

Change-Id: I80d649ac9c7ca92b241b1d4cbf9d8d6dd3d74489