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

* commit '32241895dfbef8a84f60c7294b334a5ae8e28fee':
  Handling service number convert while roaming.