Merge "Add executors to NsdManager"