Merge "diag: dci: Fix possible dangling reference" into msm-4.9