Merge "Fixed that modem data roaming state was not preserved properly" am:...
Merge "Fixed that modem data roaming state was not preserved properly" am: 9d5ea027 am: 3c5f1948 am: 76dff15e -s ours
am: bd59a8dc -s ours
Change-Id: I68dab25a9cb7f0465036cc6a3d3e9bc74a17c397