Merge "ObjPtr misc cleanup" am: db8eed0fa5
am: 54fa4375d3

Change-Id: Idbf9406cbffa721294d45351ee6ab862a7917ad5