Backed out changeset 08d032cb14a9 (bug 965656) for B2G ICS Emulator Opt M7 Test Failures