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

Change-Id: Iff960bc05c66248914f2e2b522e702e981fefa3f