Merge "Revert "Revert "Prevent races with GC when transferring objects between threads""" am: e0007301 am: 9f13dae9 am: c98bddc9 Change-Id: I023eedf99c1aaa66c7363f324573714a812cbe9f