Merge "Specify netId when adding/removing routes."