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

Change-Id: I167e56d78a5a1ef6c2f1bcad891d5f20f4e07375