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

[wrupdater] From https://hg.mozilla.org/mozilla-central/rev/09de2f84aa1c269557f62fcf84f817d0f6816890