Always send the device ID when making device management requests.

net/tools/testserver/device_management.py

Index: net/tools/testserver/device_management.py
diff --git a/net/tools/testserver/device_management.py b/net/tools/testserver/device_management.py
index aec323ac9918bb23f6aa0b53ae6b8b719e346324..d71522741a950dcc2cf2eab2ca6373a7bf10fd52 100644
--- a/net/tools/testserver/device_management.py
+++ b/net/tools/testserver/device_management.py
@@ -227,13 +227,15 @@ class RequestHandler(object):
     """
     error = None
     dmtoken = None
+    request_device_id = self.GetUniqueParam('deviceid')
     match = re.match('GoogleDMToken token=(\\w+)',
                      self._headers.getheader('Authorization', ''))
     if match:
       dmtoken = match.group(1)
     if not dmtoken:
       error = dm.DeviceManagementResponse.DEVICE_MANAGEMENT_TOKEN_INVALID
-    elif not self._server.LookupDevice(dmtoken):
+    elif (not request_device_id or
+          not self._server.LookupDevice(dmtoken) == request_device_id):
       error = dm.DeviceManagementResponse.DEVICE_NOT_FOUND
     else:
       return (dmtoken, None)