Snap for 5716220 from fe4f9ebb459e656081fff3554c5a5556c8e2afd9 to qt-c2f2-release

Change-Id: I185516a6f911d6af4c35aeacef6595de4ec52e0a