Merge "diag: Make DCI change not to access info from a dangling pointer"