Merge "Add extra handling for loading intern tables"
am: 710d785a56

Change-Id: Ibd3cfa1a7ff2ab8e9debed538c6801f97bba6f18