Merge "Revert "fs_mgr: correct warning on unused function parameter""