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

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