Merge "Add new column enabled_mobile_data_policies to siminfo table"