Merge "Fix N9 boot."