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

Change-Id: Ic8735187a22df886f07da887f12dddff248d1028