Merge "Fix siminfo table creation" am: 2c19a93951
am: 0af0f8297d

Change-Id: I214699d5b98918859ad2b6925c48fe4a3c313037