Merge change 4324 into donut

* changes:
  AudioService: Fix routing problem recently introduced in setRouting().