merge_pr_17476
Differential Revision: https://phabricator.services.mozilla.com/D35410 bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1559494 gecko-commit: 440efb54ea2061cc576c1c6e0823b5cf9ac8a1a9 gecko-integration-branch: central gecko-reviewers: jmaher