Back out 7e5522d403c1 and 92fc4bf7a9e9 (bug 880879) for Android test failures
CLOSED TREE