Merge "bug fix: handle multiple port settings change events signalled at once" into oc-dev am: f8677dcfdb am: 37b490df35
am: bb3fab4688

Change-Id: Ia32cd5afe3cee8431d39769a10962183fd3c6b2f