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

Change-Id: I6fa75df81535fb83f6d87bd2644959800f1907e0