Snap for 5333170 from 0e06489f538d99656ba2594d1d1aa6f24ba825f4 to qt-release

Change-Id: I399935581c9ec93d6dfa00bf5749fd98c30cae68