Merge "Correct comment in boot image header" am: fe86a1473f
am: ffeb8793e4

Change-Id: Ic8acda680e499465f417b0a2628a1edf5f3934e0