https://github.com/mozilla-b2g/gaia/pull/19664