am 9b8e3cd8: am 1b8dbe74: Merge "Lose bootmode and console globals."

* commit '9b8e3cd8f5a61541637ae6a40850d933f1b205b7':
  Lose bootmode and console globals.