Merge "Remove NsdSettings from test"