Snap for 4954221 from b2c5d92035f5d76a9baaef2abcf3dc4997c5942d to qt-release

Change-Id: I173a07cdaafe25ab62de696c5bab84348f8d9a41