Merge change 7167

* changes:
  Fix minor obex bugs and re-format the comments