Snap for 5637134 from b6f4830d89c697b4c8f5a445f4b01e7bca93d4cd to qt-release

Change-Id: Id7eeb38e2ef0f3de41deae8b323ddea6367c82d4