Merge "Clean up L2ForwardingService"