Merge changes I53ebf1bb,I8540af27

* changes:
  Enable new NsdManager backend on U+
  Update NsdManagerTest for newer backend usage