Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev