Merge "Drop allowing old test.idempotent_id"