am bcbb2044: am 23519002: Merge "fix sms test" into jb-dev

* commit 'bcbb20444ac1db6be0bf91749438505518b10ec0':
  fix sms test