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

Change-Id: I43194f0cffd61188631e2bc9e526cffc072e24aa