Merge "diag: Update last event and last log message values"