This change will conflict with https://github.com/mozilla-b2g/gaia/pull/15118