am 1f86a5d3: am 504d01e2: Merge "Add configuration to control converting sms...
am 1f86a5d3: am 504d01e2: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev
* commit '1f86a5d3':
Add configuration to control converting sms destination number