Merge "Better handle remove interface from router for unknown port uuid"