Merge change I93f500a5 into eclair

* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.