Differential Revision: https://phabricator.services.mozilla.com/D59901

[ghsync] From https://hg.mozilla.org/mozilla-central/rev/5ad1eff4ce669f10abba3e70b0be0e9cb378f651