Merge change 7735

* changes:
  Fix issue 1795088       Improve audio routing code