Backed out changeset e7f7cc81c103 (bug 943262) for breaking Android S4 tests