Original Revision: https://phabricator.services.mozilla.com/D213442

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