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

Change-Id: Ide0ff27e0de513dd2687e3fc30e177cd1d5fd45c