Merge "diag: Update the logging codes of events, logs and msgs"