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

* commit '7da1ad699989db8417ce54eb26697eae4a30f634':
  Fix NPE on some phones at startup.