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

Change-Id: I5ca076ba73c470c301502a73e5cec66c6283b53d