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

Change-Id: I810feb06975e4643b19b7486ca9b3aed1da0287c