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

Change-Id: If2782297ecd3b6bef8d8be5b1427aed8fcdb7aee