diff --git a/client_library/client_dbus.cc b/client_library/client_dbus.cc
index 18ae23b..d046502 100644
--- a/client_library/client_dbus.cc
+++ b/client_library/client_dbus.cc
@@ -26,7 +26,6 @@
 
 #include "update_engine/update_status_utils.h"
 
-using chromeos_update_engine::StringToUpdateStatus;
 using dbus::Bus;
 using org::chromium::UpdateEngineInterfaceProxy;
 using std::string;
@@ -48,13 +47,13 @@
 namespace {
 // This converts the status from Protobuf |StatusResult| to The internal
 // |UpdateEngineStatus| struct.
-bool ConvertToUpdateEngineStatus(const StatusResult& status,
+void ConvertToUpdateEngineStatus(const StatusResult& status,
                                  UpdateEngineStatus* out_status) {
   out_status->last_checked_time = status.last_checked_time();
   out_status->progress = status.progress();
   out_status->new_version = status.new_version();
   out_status->new_size_bytes = status.new_size();
-  return StringToUpdateStatus(status.current_operation(), &out_status->status);
+  out_status->status = static_cast<UpdateStatus>(status.current_operation());
 }
 }  // namespace
 
@@ -110,7 +109,8 @@
   *out_progress = status.progress();
   *out_new_version = status.new_version();
   *out_new_size = status.new_size();
-  return StringToUpdateStatus(status.current_operation(), out_update_status);
+  *out_update_status = static_cast<UpdateStatus>(status.current_operation());
+  return true;
 }
 
 bool DBusUpdateEngineClient::GetStatus(UpdateEngineStatus* out_status) const {
@@ -119,7 +119,8 @@
     return false;
   }
 
-  return ConvertToUpdateEngineStatus(status, out_status);
+  ConvertToUpdateEngineStatus(status, out_status);
+  return true;
 }
 
 bool DBusUpdateEngineClient::SetCohortHint(const string& cohort_hint) {
diff --git a/client_library/include/update_engine/update_status.h b/client_library/include/update_engine/update_status.h
index edf90b4..059181c 100644
--- a/client_library/include/update_engine/update_status.h
+++ b/client_library/include/update_engine/update_status.h
@@ -21,6 +21,11 @@
 
 #include <brillo/enum_flags.h>
 
+// NOTE: Keep this file in sync with
+// platform2/system_api/dbus/update_engine/update_engine.proto especially:
+// - |UpdateStatus| <-> |Operation|
+// - |UpdateEngineStatus| <-> |StatusResult|
+
 namespace update_engine {
 
 // ATTENTION:
@@ -43,6 +48,13 @@
   // Broadcast this state when an update aborts because user preferences do not
   // allow updates, e.g. over cellular network.
   NEED_PERMISSION_TO_UPDATE = 10,
+
+  // This value is exclusively used in Chrome. DO NOT define nor use it.
+  // TODO(crbug.com/977320): Remove this value from chrome by refactoring the
+  // Chrome code and evantually from here. This is not really an operation or
+  // state that the update engine stays on. This is the result of an internal
+  // failure and should be reflected differently.
+  // ERROR = -1,
 };
 
 // Enum of bit-wise flags for controlling how updates are attempted.