Merge change 5239 into donut

* changes:
  Fix SMS Ack.