Improve diagnostic messages for reading image header.
am: 1b13d28d5d

Change-Id: Ie00722ab20661aca779da41ab72b40ba77f930c8