Merge "Add part ID reuse to API contract"