Merge change I49f02be9 into eclair

* changes:
  Issue 2265163: Audio still reported routed through earpiece on sholes