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

Change-Id: Ib6d5205864a3cc2042004370c4bffca7179f2bfe