If there is a device id use that instead of a new one for re-enrolling.

chrome/browser/policy/device_token_fetcher.cc

Index: chrome/browser/policy/device_token_fetcher.cc
diff --git a/chrome/browser/policy/device_token_fetcher.cc b/chrome/browser/policy/device_token_fetcher.cc
index 09df87c29ee3c20b2904762dfffb791812c18038..f400a041ac7497f61ea8bab153ddc7281993d7d3 100644
--- a/chrome/browser/policy/device_token_fetcher.cc
+++ b/chrome/browser/policy/device_token_fetcher.cc
@@ -178,6 +178,8 @@ void DeviceTokenFetcher::FetchTokenInternal() {
     request->set_machine_model(data_store_->machine_model());
   if (data_store_->known_machine_id())
     request->set_auto_enrolled(true);
+  if (data_store_->reregister())
+    request->set_reregister(true);
   request_job_->Start(base::Bind(&DeviceTokenFetcher::OnTokenFetchCompleted,
                                  base::Unretained(this)));
   UMA_HISTOGRAM_ENUMERATION(kMetricToken, kMetricTokenFetchRequested,
@@ -192,6 +194,8 @@ void DeviceTokenFetcher::OnTokenFetchCompleted(
     status = DM_STATUS_RESPONSE_DECODING_ERROR;
   }
 
+  LOG_IF(ERROR, status != DM_STATUS_SUCCESS) << "DMServer returned error code: "
+                                             << status;
   SampleErrorStatus(status);
 
   switch (status) {