Merge in sms fixes

merges:
https://googleplex-android-review.googlesource.com/#/c/252609/1

Change-Id: I04a0ffa4feb36683f1392ec730742f5f7e10fa32
1 file changed