Merge "diag: Bring event last id up to date"