Merge remote branch 'cros/upstream' into tempbranch

client/common_lib/boottool.py

Index: client/common_lib/boottool.py
diff --git a/client/common_lib/boottool.py b/client/common_lib/boottool.py
index 1c298616419389d4cc019afc55581d9e7a0683ca..f123f1c232bce85c2a07756d8b495e8c43f12513 100644
--- a/client/common_lib/boottool.py
+++ b/client/common_lib/boottool.py
@@ -264,18 +264,14 @@ class boottool(object):
 
     def boot_once(self, title=None):
         """
-        Sets a specific entry for the next boot  Then falls back to the
+        Sets a specific entry for the next boot, then falls back to the
         default kernel.
 
         @param kernel: title that identifies the entry to set for booting. If
-                evaluates to false it will use the default entry title.
-                (FIXME: that does not make much sense, if an entry is default
-                by definition that means it boots next anyways so maybe it
-                should be a NOP for title evaluating to False)
-        """
-        if not title:
-            title = self.get_default_title()
-        self._run_boottool('--boot-once', '--title=%s' % title)
+                evaluates to false, this becomes a no-op.
+        """
+        if title:
+            self._run_boottool('--boot-once', '--title=%s' % title)
 
 
     def enable_xen_mode(self):