am 41506304: (-s ours) am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread

Merge commit '41506304b86a9c9a605e8b96318e61f0f8f6a235'

* commit '41506304b86a9c9a605e8b96318e61f0f8f6a235':
  DO NOT MERGE: Remove Device Bluez-Dbus interface watch.