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

Change-Id: I330b895d9111e855eb06384d072cf922dbf7a814