Merge "Moving simple fwding logic from ARPHandler into SimpleForwarding"