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

* commit 'd8f5590bb53b9f78e81d5fc2988f87d6700cc9a9':
  Handling service number convert while roaming.