Backout changeset 531f544bc9ce for breaking B2G tests.
Merge m-c to inbound.