Merge "CCodec: Update watchdog to handle timeouts accurately"