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

Change-Id: I973ae20ce1b63c9b44d6da24c1f837db6eef85d0