Backout changeset 1e13634eceb2 for failures in R6/R10 on B2G ICS Emulator Opt.