Merge change 3015 into donut

* changes:
  make sms calculateLength radio-independent