[automerger skipped] Merge "CCodec: increase timeout for operations" into qt-dev am: a69eacc42c am: f7463ea232
am: 990c522205 -s ours
am skip reason: change_id I2cc946a5e3d66f64886954bb82e01dd5c72c0ffa with SHA1 ba36afefaa is in history

Change-Id: Iacfc523c50dbfcd6d4b3eed872736110b5ec8f96