Snap for 5138341 from 03da7a117213b7cf9301ec7c732327a0f15119c1 to qt-release

Change-Id: Ifcc8d25d7cd3bcbf0c7c5c2eb75ed7d2435eddaa