am 069f62de: Merge "Fix N9 boot."

* commit '069f62de20f83226801e9a43c372ba34d3c3c12f':
  Fix N9 boot.