Backed out changeset 9ac001517068 (bug 1045053)
Backed out changeset 4782b099ef93 (bug 1045053)
Backed out changeset f20d3ef82554 (bug 1045053) for Android rc* test failures