Merge "fs_mgr: Fix return in error case"