am 511a0134: Merge change 2302 into donut

Merge commit '511a0134e1bfe90a23960eea72eca565e52aa816'

* commit '511a0134e1bfe90a23960eea72eca565e52aa816':
  added SmsMessage ConcatRef parsing validation