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

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