Backed out changeset 99eb8a370b21 (bug 952840) for permament B2G ICS Emulator Opt test failure