Merge change 3178 into donut

* changes:
  Add additional parameters to SETUP_DATA_CALL and SMS response.