Merge "Fix Emulator boot."