Merge "Fix siminfo table creation"
am: 2c19a93951

Change-Id: I115ca533b162fdd5953280fe29e15815b6aa479f