Snap for 5645017 from 0ea61abe1012fa25e9b15e95e04b368471c4ac6a to qt-release

Change-Id: I982d71f7ae6e6e6f08d7fc8f5c5bddd44f322fdc