Clean up explicit conversions to ObjPtr<>.
am: d7e9bbf092

Change-Id: I896b4ec73ec92e9140c25093655e1868e1dbcaa5