"ESP" is "EFI system partition", so "ESP partition" is redundant. (cherry picked from commit 250db1bf) (cherry picked from commit 6822cfa5)