Merge "Add a new column: subscription_type to siminfo table." am: 141eceb49f am: dee22ae28a
am: 167afeb0d3

Change-Id: I462c2428ff51da08777825db7db211f36835e434