Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

server/hosts/serial.py

Index: server/hosts/serial.py
diff --git a/server/hosts/serial.py b/server/hosts/serial.py
index d363cb7337f7075e9bac89d8357ce2921fe8da01..d514dba33205d7671e8aa45c5c992f0f7ffdc535 100644
--- a/server/hosts/serial.py
+++ b/server/hosts/serial.py
@@ -165,7 +165,6 @@ class SerialHost(SiteHost):
                     # Run on num_attempts=1 or last retry
                     try:
                         self.wait_for_restart(timeout,
-                                              old_boot_id=old_boot_id,
                                               **wait_for_restart_kwargs)
                     except error.AutoservShutdownError:
                         logging.warning(warning_msg, num_attempts, num_attempts)