Re-try trunk port lookups that fail.

Change-Id: I570995f44cf784b4fbc76d638bdd2bd462e57ba0