am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev

* commit '860d0cd452529e7a01152582e6535c2129a46af7':
  Cleaner initial boot.