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

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