Snap for 5606075 from 7c32992183d31c1f270ff5fe79943d277431d9f3 to qt-c2f2-release

Change-Id: I91736faf7e6161fb44a35192ad37e526af4f9800