am ece41093: am 3c1c1375: am 8d31358f: Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev

* commit 'ece410939fbb7a463c79ea63adf3b96c12dc386e':
  Merge "NsdService does not clean up after exiting clients"