Merge "Correct comment in boot image header"