Merge "Add + code handling logic for SMS Global Roaming"
automerge: f19176f

* commit 'f19176ff2f1deb672172f953626fabc45304d435':
  Add + code handling logic for SMS Global Roaming