Merge "Move intern table to ObjPtr"
am: 9be86bb445

Change-Id: I1fb6cff9ac119f6edc7ee5f9d23405dcea651372