Merge changes I9ad4ce81,I360d539e

* changes:
  NsdService: minor cleanups
  Nsdmanager/NsdService: add logging
tree: 74bb3ccca5f09e03a08e725fa00a5c8dfbccd4cc
  1. core/
  2. services/
  3. wifi/