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