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

Change-Id: I4d7e8e9d5171c145c86a78514c07e503b7d1ab48