Merge "NsdManager: remove duplicated argument validation" into oc-mr1-dev
am: 4f48862d0f  -s ours

Change-Id: I66aa7d2d7128272bedc04568dbdcb759a3be8afe