Merge "Bring in the switch from Unsafe.*Object to Unsafe.*Reference"