Merge "NsdService: bootstrap unit tests" am: 7ca060aa95 am: dd53c962b2 am: d29ce6ae8c
am: e2377c88e3

Change-Id: I018d6fbface4a9d4a568486dedd30d05e0ddd949