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

Change-Id: I1924fab10369e5af6c8bb93f731bba4a30fe9040