ObjPtr<>-ify instrumentation. am: 19711d479c
am: bd2a4db4c6

Change-Id: I3f20b15e42f563df0103e76a9bf9bd8ad306a990