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

Change-Id: Iba9bbefc66499d2e592aa9d73ae4521f985eabd0