Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2 am: d2181235b9
am: 658f2e5cd7

Change-Id: I86a9db7fe4f925162e1632152862c7b246230db9