aren't this changes more related to https://github.com/mozilla-b2g/gaia/pull/12943 ?