Merge change 1127 into donut

* changes:
  SmsHeader rewrite, in preparation for migration to public API.