Backed out changeset 2996cc51cb0d (bug 1000305)
Backed out changeset 45940d63b0c7 (bug 1000305) for Android Test failures