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

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