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

Change-Id: I30d028cc7e6e93480bdf78fe16c5ecedef556269