am a2fe0e30: am 21abdd56: Merge "Fixed an issue were switching data roaming would disable other settings." into lmp-dev

* commit 'a2fe0e307d139cb4a81b963e4942dd9327b37b1c':
  Fixed an issue were switching data roaming would disable other settings.