Merge "Fix NPE in NsdServiceTest" am: 60d5390f7a am: f9422cc65b am: a5d620ae92
am: a838fcfa75

Change-Id: I5a4837078a7506b30497bba1cceb416ab37e82d9