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

Change-Id: I5ca076ba73c470c301502a73e5cec66c6283b53d