Merge "Fixup lint errors in ServiceWatcher" into sc-dev