Snap for 5406228 from f4bd4da38d36faaca7c25b480473fecb7ac62ac6 to qt-release

Change-Id: I6b7f93e0f089176e76850fd7b76d0beb2da708d3