am 0b774530: Merge change 3015 into donut

Merge commit '0b77453076a22569f24318d194b378b68f11a63e'

* commit '0b77453076a22569f24318d194b378b68f11a63e':
  make sms calculateLength radio-independent