Merge "diag: Add support for diag dci restart"