Snap for 5511022 from 186e21ff803b67723e9a82a1d320d4034df59be2 to qt-release

Change-Id: I312704bee3731aaa653ce0763862c7bb8f411ff1