Backed out changeset 6bf1863c97a5 (bug 1009306) for m6 and m7 android test failures on a CLOSED TREE
Backed out changeset 8179a07a4181 (bug 1009306) for m6 and m7 android test failures on a CLOSED TREE