am ce128ae6: am b6db2d51: Merge "Bluetooth OBEX timeout problem."

* commit 'ce128ae66dc6d430aad09ad920133bc040d834c8':
  Bluetooth OBEX timeout problem.