Backed out changeset 1a2c37d55e5e (bug 949666) for m-9 test failures in  B2G ICS Emulator debug