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