am 08b7e785: am 7da1ad69: am c524ca27: Merge "Fix NPE on some phones at startup." into jb-dev

* commit '08b7e78597b06b3801d909c9e9ca1538ed9fc355':
  Fix NPE on some phones at startup.