Merge "Change indirect reference table to use ObjPtr" am: 463a67dd60
am: 22316a1570

Change-Id: I7c7b64fa33ff1805627408a821e2ed0c9c25e8b2