Merge "diag: dci: Protect the client list and command entries" into msm-4.9