Merge changes Iad0b0d52,Iee727308

* changes:
  Use recording callbacks in NsdManagerTest
  Refactor NsdManagerTest