Merge "Fixes gcar_emu boot"