BUG: Annotate ReadUnknownImageType component type correctly.

Change-Id: I6f8e5614ff5561416a8659af9394ec4d055ea062
Merge "BUG: Annotate ReadUnknownImageType component type correctly."