Ensure no-op merges get a change id

Change-Id: Icda1db985b3a0654fa1274e700cddfe2f990df12