Merge "Remove redundant list_router_interfaces()"