Merge "Use 0-23 hours in log timestamps instead of 1-24."