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