am 971af003: Merge change I65208317 into eclair

Merge commit '971af0030568ba25a83788506a3f29bc9f1cd10d' into eclair-plus-aosp

* commit '971af0030568ba25a83788506a3f29bc9f1cd10d':
  Update OBEX to fix missing several contact entries issue.