Merge change 22055 into eclair

* changes:
  Improve Obex compatibility