Bug 847634 - Add lines missing from uplift. r=mfinkle a=lsblakk

--HG--
extra : rebase_source : b0f26b82abb7d9a1e2a6e6cd0dd9907d2ad2e717