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

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