Add support for multiple port allocations

Change-Id: I156bccebdd392cd4a912599b5a2c815587e77134
Merge "Add support for multiple port allocations"