Bug 832239 - uplift to v1-train, continued

https://bugzilla.mozilla.org/show_bug.cgi?id=832239#c22