Merge change 7482

* changes:
  Fix a bug introduced in obex cleanup