Merge "Fix bug incrementing log time"