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

Change-Id: I028c248ebef366eb439b369adad87047086aa07b