Bug 843631 - Update emulator for bug 843614, r=rail