Merge change 9647

* changes:
  init: Add hw3d master/client nodes to device list.