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

* commit '1b8dbe74412dd27f2950e0c84feaf09c5b7dcbf0':
  Lose bootmode and console globals.