Merge "Revert "Prevent races with GC when transferring objects between threads""
am: a2cbb2b072

Change-Id: I3b6601bcebe66d80d29a80851c236392952659f9