Merge change 23557 into eclair

* changes:
  init: add some more audio devices