Snap for 5681502 from 87d7ad9d8fe6cbb0405983b37ff9e79927451bc7 to qt-c2f2-release

Change-Id: I7e30a4010e7e11b155616e46735fd4d169548305