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

Change-Id: Icd4d19effb614ddb95691ecced07c5bd34eb8b6e