Merge "diag: dci: Index DCI client table by client id"