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

* commit '6657d2248e902289476c4b937f5d6a1585c95ec2':
  Fix N9 boot.