am f209b46c: Merge change 2092 into donut

Merge commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07'

* commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07':
  Make sure smsHeader != null before using it.