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: 32bada91
am: 4148768d
Change-Id: Iea184f285b381ddfaa04f3cc92193f0e3a8192ff