Backed out changeset 7a3c1d05d492 (bug 1037079) ics emulator opt 3 test failures