Merge "Remove TimeController constants."