Merge "Move Heap parameters to ObjPtr"
am: 33625ed00f

Change-Id: I9e58f55afb03552095f81f39eea275fa40639895