Merge remote branch 'cros/upstream' into master

server/hosts/serial.py

 import os, sys, subprocess, logging
 
 from autotest_lib.client.common_lib import utils, error
 from autotest_lib.server import utils as server_utils
 from autotest_lib.server.hosts import remote
 
 
 SiteHost = utils.import_site_class(
     __file__, "autotest_lib.server.hosts.site_host", "SiteHost",
     remote.RemoteHost)
@@ skipping 147 matching lines @@
                     except error.AutoservShutdownError:
                         logging.warning(warning_msg, attempt+1, num_attempts)
                         # re-send the hard reset command
                         self.run_conmux(conmux_command)
                     else:
                         break
                 else:
                     # 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)
                         msg = "Host did not shutdown"
                         raise error.AutoservShutdownError(msg)
 
         if self.job:
             self.job.disable_warnings("POWER_FAILURE")
         try:
             if wait:
                 self.log_reboot(reboot)
             else:
                 reboot()
         finally:
             if self.job:
                 self.job.enable_warnings("POWER_FAILURE")