[API]: Fix for multiple HTTP or TCP ports per device

Change-Id: I4f28a42025c2d1520f2bb6bc86941cc7ee503212
Merge "[API]: Fix for multiple HTTP or TCP ports per device"