Merge "fs_mgr: remove old fs_mgr functions that are not currently used"