These matches look like they should be "or" (if any of these images is
already there, fail), not "and". This caused some confusion when the
image was being leaked (I722ba599fbc690d6cb967070c05215b98a73dcaf) as
this wasn't triggering.
Change-Id: Ic6dad7bbf9013e994eb80a54bc5191a96bd4be94