Backed out 2 changesets (bug 893184) for Nexus 4 startup crashes.

Backed out changeset e1b2f6bd92c4 (bug 893184)
Backed out changeset 560f18fc3ae3 (bug 893184)