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

Change-Id: I7b9945fcb36a6d454e7dc52986dd9ab5b538605d