Partially ObjPtr<>-ify Object, fix stale ref in test. am: dfc0de7696
am: de8ba31196

Change-Id: I5151b4d68a6f13dc9f119975b5a97ae077dc7b84