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

* commit '6fb2b7a20e8a5a93580868d186cfd084c3d7cd92':
  Handling service number convert while roaming.