Snap for 5663715 from d9787c2aa4668f26c71745a6ded109e2bd8f9836 to qt-c2f2-release

Change-Id: Id3e4aff784c300ab87a55271783a4bd4dfedaa97