Merge "Manually initialze the intern table." am: 5b3e60360c
am: f9dd52a4eb

Change-Id: Ie9bac073a39c59c0c8a9dd7f71760255420c3142