Fix imgdiag after ObjPtr<>-ify Object::As*(). am: 71d614f12a
am: ddd7296f80

Change-Id: Ib126ae2fcd647230e07c47d11fbaa89fc86b9037