Merge "Use TimeUnit enum to specify the bucket size."