Merge "Support running without a boot image."