Merge "fd_utils: Fix broken usage of iterators." into nyc-mr1-dev