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

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