am 234e41f7: am 32241895: Merge "Handling service number convert while roaming." into lmp-dev

* commit '234e41f7287f431a36bde9240f3c4bc198bc170c':
  Handling service number convert while roaming.