Merge "Add part ID reuse to API contract"
am: d49a6c86f4

Change-Id: I6bddd19ea31e012f340e62e035ca7a0867eb239e