am 9391ee9e: Merge "Handling service number convert while roaming." into lmp-dev

* commit '9391ee9e8b9f0daab2fd7a42189e3deac96c0e48':
  Handling service number convert while roaming.