am f471861e: Merge "Move the recovery image version out of the menu header."

* commit 'f471861e832e4be3a07359dfb72c1812de64b7ac':
  Move the recovery image version out of the menu header.