Merge "Fix emulator boot"