Merge "Rename ObjPtr::Decode to ObjPtr::Ptr" am: 556c9a2f18 am: a386275651
am: 12238c82cb

Change-Id: I46792cbf272f66af03bf4ad64ce8eaf52d0cc8bd