Merge "Handling port up down event for Bug 3558"