Merge change I65208317 into eclair

* changes:
  Update OBEX to fix missing several contact entries issue.