Merge "[Nsd] Fix XML documentation warnings"