Merge "bug fix: handle multiple port settings change events signalled at once am: 0a542276f8  -s ours am: 2d7693b618  -s ours" into oc-mr1-dev am: d2455fe8a8  -s ours
am: 8c9a324efa  -s ours

Change-Id: Ib5fde5dfbdbb2de79b241318b8910d4532ad16d6