Merge "Fix emulator build"