Merge "Remove ISA from boot image name."