Backed out changeset 1314168b5271 (bug 977372)
Backed out changeset 4fb349c12a63 (bug 977372) for b2g ics emulator debug m8 test failure