am 641bb3d8: expose (but still hide) sms user data headers

Merge commit '641bb3d8dfd72f57356d39ef00256d6077c9e235'

* commit '641bb3d8dfd72f57356d39ef00256d6077c9e235':
  expose (but still hide) sms user data headers