Call ReferenceQueue add outside of active GC block
am: 9942687cdc

Change-Id: I9a771d11a91d080f183038a09c4769fff3ed7c65