Merge "Merge "NsdService does not clean up after exiting clients"" into klp-modular-dev