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

Change-Id: Ic42045704f9d53770633ade9472d6e51603a76ef