Simplify default port handling

Test: NA
Bug: NA
Change-Id: Ic9b62a006f94a75f1f43d51aa8d1d8dfde496fb1
3 files changed