Back out d0b4c5c28fb0 (bug 956993) for Android test failures
CLOSED TREE