Merge "Move Heap parameters to ObjPtr" am: 33625ed00f am: a23f6e88e9
am: 10fb9eb749

Change-Id: I10e259dd9d69aff3aefa59a7e68615fa26968c1a