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

Change-Id: I56e6957091b8f8b0aff6720e8b77de824a82ad33