Snap for 5511022 from d59feff1bf71a990d93d3dcaa13de73c9e60a4e8 to qt-release

Change-Id: Iaea29935604681c90e5b8e11200d65d40107f9ae