Merge changes from topic "am-09e820e1aa2f4beb8e378aad8d0dd0cf"

* changes:
  [automerger skipped] Merge changes I46fb8cfe,I4181b465,I99e1ca1d,I66b09693 am: aa6698b0 am: 16aa1bcc am: 4f3dc537 -s ours am: 3c1bcfa4 -s ours am: 66e37f67 -s ours am: 5c025334 -s ours
  [automerger skipped] Don't remove devices on onHotplug() am: c188a568 am: d27da810 am: 4b324cc6 -s ours am: 0381f99f -s ours am: 4215661e -s ours am: 9cbc8845 -s ours
  [automerger skipped] Assign local device portId 0 am: c8adf1f7 am: cc03484e am: d60d3a97 -s ours am: af616590 -s ours am: 0c73a004 -s ours am: 7c5f3e82 -s ours
  [automerger skipped] Set device type on first message received am: 888ee5be am: 9ae53810 am: ca6ded02 -s ours am: d66807e3 -s ours am: 7d370f24 -s ours am: f392272b -s ours