Merge "Move f/b/packages/Nsd files to f/b/packages/ConnectivityT"