Merge "fs_mgr: use more unique_fd" am: 5ae47e10c8 am: 11aeda148c
am: 4f87fa35b9

Change-Id: If130de111fb26d72ad9efc7c7b323a79bfadb4fd