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

Change-Id: Idfcd902329efcd54890de2917c7c5808acc0d62e