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

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