Merge "Move nsd APIs to their own directory"