Backed out changeset 3f0d227e054d (bug 1018928)
Backed out changeset e92f1571ab9d (bug 1029401) for Android Test failure on a CLOSED TREE