Merge "Correctly handle instrumenting threads multiple times."
am: abd52cde77

Change-Id: I10c2cb4720d6fe2282971ba64c3170e85c8d24be