Backed out changeset 0ca230c9d79a (bug 975270) for m4 b2g-ics opt permanent test failure
Automatic merge