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

Change-Id: Iaf0679790e934baaaf48bcb04098aa18deca4d60