Merge "Fix router port IP address references"