Merge "Correctly handle instrumenting threads multiple times." am: abd52cde77 am: 0d34f2faed
am: 4d765f1c0e

Change-Id: Ied8a0d401b877264f11764ffac27f5e15a14d5c1