Snap for 5706862 from f699f74571302673f4f45677d478c2a9e6c77a0c to qt-c2f2-release

Change-Id: I14a6e6ef4b04ae71088da3d16d4a915dd8bc1ed7