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

Change-Id: I7c71387851c111d357b4ab834daafce824f4e241