Merge "Fix reference-type obj handling in generational CC"
am: 8f86ef1699

Change-Id: I521e693fd8fdcf25261cfb80babadf9a7ed25467