Snap for 5821701 from 91ca872a44a1c648b76949928a9e0f44b8d84930 to qt-c2f2-release

Change-Id: If14ef067b6b999603c017ab2cf810aeb4e284a86