Merge "diag: Fix incorrect parsing of log codes" into msm-3.0