Allow multiple ports from same host

Change-Id: I782300c62a8a227b6ee75c15222e255fefeed3bd