Merge "diag: Add DCI support" into msm-3.0