Merge "Add idempotent_id lines for tests"