Snap for 4966162 from d8e8c7b6fa342de4692b00b7f60e05f409c4f211 to qt-release

Change-Id: I268c64cbaa4255cf0ecb6af9dd25fed3ca1bd5c4