am a90f82fc: am ff872257: Merge "catch exceptional cases on factory-fresh...
am a90f82fc: am ff872257: Merge "catch exceptional cases on factory-fresh devices." into jb-mr1-lockscreen-dev
* commit 'a90f82fc':
catch exceptional cases on factory-fresh devices.