Merge "timer: fix PRIi64 usage"