am 69b2c2a1: am 6657d224: am 069f62de: Merge "Fix N9 boot."

* commit '69b2c2a125f655a43f54a181d5ddbe714f4848ca':
  Fix N9 boot.