Snap for 5090430 from ca1d962b1b5581d476fe3a3087e752efe397b8fc to qt-release

Change-Id: I7ef9120eb485ef1011db667902cacdba83b530e9