Merge "NsdManager: unit tests for argument validation" am: 3cff7deecb
am: d97e358f7a

Change-Id: Ibd6090d57908da159409bd1e886914446e6ba2da