improve the handling of images with duplicate component IDs Patch written by [email protected] and [email protected] (cherry picked from commit 0061f897d4f6217475bbb4bb63fcbd7f8f4af3e5) Change-Id: I62b7e4d04e9b1c6be18d33e9ddd6d09a0c84daaf