Merge change 2092 into donut

* changes:
  Make sure smsHeader != null before using it.