Snap for 5663715 from 0a40cb0bf55ac3d7d6981b49b636d85a6d93d8c7 to qt-c2f2-release

Change-Id: I6e474ce3fd00ef162c6a528f2489cfa90bb5bb5f