Merge change 1406 into donut

* changes:
  Internal APIs to get/set SMSC address.