Merge "initial value for data_roaming based on carrier" am: 973ddd55eb
am: 0c2b4d7308

Change-Id: I2465d8c0c5349cde96b9097adb706bae96627f0c