Merge "Fixed that modem data roaming state was not preserved properly" into...
Merge "Fixed that modem data roaming state was not preserved properly" into oc-dr1-dev am: 915dfa42 am: b3f556a1
am: fd8076d9
Change-Id: Ica3228f3397ed5e295d5ed2fde8ee365d6c41978