Merge "Attempt to fix the emulator."