Backed out changeset 2b5863a3f0ae (bug 997328)
Backed out changeset a7b80bdc8a7c (bug 997328) for Android RC testfailures