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

Change-Id: Ie86b5d93f0e88740213abcc87cff4307b742b9e7