Fix merge with an already existing Change-Id

The merge failed when another review had the same Change-Id (if the
review was abandoned or on another branch for instance).

Change-Id: If324e309744d6386267f4a44b948291edf3e6ebb