am f3a2895a: Merge "NsdService does not clean up after exiting clients"

* commit 'f3a2895a31069a7c01c69d011b290fcfb3298b3c':
  NsdService does not clean up after exiting clients