Merge "Fix numeric header values for kernel_id and ramdisk_id"