Snap for 5212161 from 4bf9421dcae8d04e951987cbea13ff19a7010fcb to qt-release

Change-Id: If5590213504bf459cbb970be6b46fb9556141e03