Merge "Remove the DisabledState from NsdService"