Merge "Add thread ID reuse to API contract"
am: a24e12b46e

Change-Id: I8c104656e7ebad8ce53a2f6f9fe39c325717794b