Merge "CCodec: increase timeout for operations" into qt-dev
am: a69eacc42c

Change-Id: I0359eb89e8423038b1c8f0b1ba0ab41adb6b3205