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

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