Merge "NFC: Fix potentially uninitialized 'port' variable."
am: f0d59e24c3

Change-Id: I6525a89a12db0a1cb9dc625eea8028b15eaaced5