am 9197081f: Merge change 26275 into eclair

Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp

* commit '9197081f8feca110455740874e06e05771f462c8':
  Send the address of the device with the UUID intent.