Snap for 5663715 from cffbeaf2db40ac50eccbdd863632f67cc8ed2b06 to qt-c2f2-release

Change-Id: If2e891a8ba3c59f9d6e198c9d2054d08f9e58ddd