Merge "diag: Update log codes"