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

Change-Id: I3ffc4393be9fbc2d70defa2abb2feddebaea911f