diff --git a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
index 8370b27..d85f4cc 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/CommandResult.java
@@ -142,24 +142,24 @@
       return this;
     }
 
+    /** Sets or clears the wall execution time. */
+    public abstract Builder setWallExecutionTime(Optional<Duration> wallExecutionTime);
+
     /** Sets the user execution time. */
     public Builder setUserExecutionTime(Duration userExecutionTime) {
       setUserExecutionTime(Optional.of(userExecutionTime));
       return this;
     }
 
+    /** Sets or clears the user execution time. */
+    public abstract Builder setUserExecutionTime(Optional<Duration> userExecutionTime);
+
     /** Sets the system execution time. */
     public Builder setSystemExecutionTime(Duration systemExecutionTime) {
       setSystemExecutionTime(Optional.of(systemExecutionTime));
       return this;
     }
 
-    /** Sets or clears the wall execution time. */
-    public abstract Builder setWallExecutionTime(Optional<Duration> wallExecutionTime);
-
-    /** Sets or clears the user execution time. */
-    public abstract Builder setUserExecutionTime(Optional<Duration> userExecutionTime);
-
     /** Sets or clears the system execution time. */
     public abstract Builder setSystemExecutionTime(Optional<Duration> systemExecutionTime);
 
diff --git a/src/main/java/com/google/devtools/build/lib/shell/TerminationStatus.java b/src/main/java/com/google/devtools/build/lib/shell/TerminationStatus.java
index 4d7a1bd..7c520e4 100644
--- a/src/main/java/com/google/devtools/build/lib/shell/TerminationStatus.java
+++ b/src/main/java/com/google/devtools/build/lib/shell/TerminationStatus.java
@@ -267,30 +267,30 @@
       return this;
     }
 
-    /** Sets the user execution time. */
-    public Builder setUserExecutionTime(Duration userExecutionTime) {
-      this.userExecutionTime = Optional.of(userExecutionTime);
-      return this;
-    }
-
-    /** Sets the system execution time. */
-    public Builder setSystemExecutionTime(Duration systemExecutionTime) {
-      this.systemExecutionTime = Optional.of(systemExecutionTime);
-      return this;
-    }
-
     /** Sets or clears the wall execution time. */
     public Builder setWallExecutionTime(Optional<Duration> wallExecutionTime) {
       this.wallExecutionTime = wallExecutionTime;
       return this;
     }
 
+    /** Sets the user execution time. */
+    public Builder setUserExecutionTime(Duration userExecutionTime) {
+      this.userExecutionTime = Optional.of(userExecutionTime);
+      return this;
+    }
+
     /** Sets or clears the user execution time. */
     public Builder setUserExecutionTime(Optional<Duration> userExecutionTime) {
       this.userExecutionTime = userExecutionTime;
       return this;
     }
 
+    /** Sets the system execution time. */
+    public Builder setSystemExecutionTime(Duration systemExecutionTime) {
+      this.systemExecutionTime = Optional.of(systemExecutionTime);
+      return this;
+    }
+
     /** Sets or clears the system execution time. */
     public Builder setSystemExecutionTime(Optional<Duration> systemExecutionTime) {
       this.systemExecutionTime = systemExecutionTime;