Merge "Cleaner initial boot." into jb-mr1.1-dev