Snap for 5797917 from a0732755c21b7e8ff542aafdec8e96829a99639c to qt-c2f2-release

Change-Id: I2116252dab5459c794e4d7a2fbebd404e55a65e5