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

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