Merge change 20859 into donut

* changes:
  Fix for sending 16-bit SMS message with header.