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

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