Merge "Move NsdServiceTest to correct directory" am: 72b5cdc1a7 am: ca9fcb79f6
am: ecf4267889

Change-Id: Ib4e100fc8219b58ab7850407735a444dad3ec153
tree: 3c6309ca77b81a1bd7e32e86c55616a396bdfc85
  1. core/
  2. services/
  3. tests/