Merge "ObjPtr misc cleanup"
am: db8eed0fa5

Change-Id: I819d4147416c486ae1b2e35585f72a798a29dfe4