Merge "Move NsdServiceTest to correct directory" am: 0a76f99621 am: ca9fcb79f6
am: ecf4267889

Change-Id: Ib4e100fc8219b58ab7850407735a444dad3ec153