Merge change 23714 into eclair

* changes:
  Some work to make audio encoding work.