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

Change-Id: Id1faabb203c6885d873acd0515a1dbaf68915334