am f7e17efa: am 80519db0: am 40dfc1d1: am 8fe7969d: am dc20ac98: improve the handling of images with duplicate component IDs

* commit 'f7e17efa07f55cf64199942e488cba7d8b2d5b13':
  improve the handling of images with duplicate component IDs