Merge "diag: Fix pointer for correct parsing" into msm-3.4