am 6099df8c: Merge "Remove ISA from boot image name."

* commit '6099df8c0695a81a8f25c47ff801998b12d09d1b':
  Remove ISA from boot image name.