[import_pr] From #3720

MozReview-Commit-ID: AsI4hT0cFGJ

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

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