Merge "fuel-astute: Erase EFI boot entry on EFI systems"