Merge "Update OWNERS for ServiceWatcher"