Merge change 2007

* changes:
  New BluetoothSocket API.