This is primarily for EC2 and other cloud environments, where the disk may be bigger than the original image. (cherry picked from commit 9d92bd7845)
9d92bd7845