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