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