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

Change-Id: Idf99cf43f6f23dd983ce1dd0155b345ce2c34c69