Merge change 26275 into eclair

* changes:
  Send the address of the device with the UUID intent.