Merge "Better timestamp for shutdown and startup events."