Merge "Add more sms error codes" am: c16da498d5
am: 8a9d38fbbc

Change-Id: Idaecf961390d15987e9d5c93fb21a796da33d989