Snap for 5636702 from a0db7b7ad76b9be9ec3bd60ea83e079a74a30401 to qt-c2f2-release

Change-Id: Ife319d36265d55b49c98078e20ab22aa7a5e9bd3