Backed out changeset 33b1caee42d2 (bug 827843) for Android test failures.