Backed out changeset e6f223a82d91 (bug 937485) for causing b2g device regressions
Merge m-c to b2g-inbound