Merge "Fix NPEs in dependent port code called by network delete"