Merge "Clean up USER_OWNER in ServiceWatcher"