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

Change-Id: I63e8d4ea85aeda6927418bf42362397fa8e7ffb7