Merge "fd_utils: address a couple of TODOs."
am: eae1ae9732

Change-Id: I8e4e92df3c1f0016de2c396345b7a0b4bc0e1cb6