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

Change-Id: I2c88d81081c7994d42eb2715f29233817730201d