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

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