Backout f3b6bc4b2590 (Bug 827749) for test failures.
Backout 645bf43f8f14 (bug 818575) for crashes on Android on a CLOSED TREE