Merge "Add toString() to ServiceWatcher"