Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread