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

Change-Id: If65c243e72e890660fc4481b375b23ba109ae577