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

Change-Id: I4e6546a02cd3614b8c28a8e0b7c1cc6501b1bd93