Merge changes from topic "cherrypicker-L15200000954882986:N47600001270136565" into tm-dev

* changes:
  Temporarily disable NsdService unit tests
  Fix service resolve on tethering downstreams